From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Tue, 3 Sep 2019 19:07:06 +0000 (+0200)
Subject: Use upstream manpage
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~93
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c972adde2ea7a95a84847609a318fbdcb2e609a9;p=gpsbabel.git

Use upstream manpage

Closes: #522332, #618856, #803509, #803512, #698326, #862299
---

diff --git a/debian/gpsbabel.help2man b/debian/gpsbabel.help2man
deleted file mode 100644
index 310c0f3b6..000000000
--- a/debian/gpsbabel.help2man
+++ /dev/null
@@ -1,3 +0,0 @@
-[see also]
-Detailed lists of filters and formats are given in the doc at /usr/share/doc/gpsbabel/htmldoc/.
-
diff --git a/debian/patches/0010-Fix-manpage-xml.patch b/debian/patches/0010-Fix-manpage-xml.patch
new file mode 100644
index 000000000..8c300cd45
--- /dev/null
+++ b/debian/patches/0010-Fix-manpage-xml.patch
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Tue, 3 Sep 2019 21:06:38 +0200
+Subject: Fix manpage xml
+
+---
+ xmldoc/gpsbabel_man.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xmldoc/gpsbabel_man.xml b/xmldoc/gpsbabel_man.xml
+index 621f080..522bc83 100644
+--- a/xmldoc/gpsbabel_man.xml
++++ b/xmldoc/gpsbabel_man.xml
+@@ -32,7 +32,7 @@
+ 	Magellan) connected by a serial or USB port.
+ </para>
+ 
+-</para>
++<para>
+ 	By flattening the Tower of Babel that the authors of various programs
+ 	for manipulating GPS data have imposed upon us, it returns to us the
+ 	ability to freely move our own waypoint data between the programs and
diff --git a/debian/patches/series b/debian/patches/series
index f3752ea72..64a9a88e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ htmldoc-location
 0008-Use-usb.h-from-system-include-dir.patch
 0011-Fix-exec-in-gpsbabel.desktop.patch
 0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch
+0010-Fix-manpage-xml.patch
diff --git a/debian/rules b/debian/rules
index bfbd9ae91..480383b38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,21 +19,7 @@ override_dh_auto_configure:
 		--with-doc=$(DOCTEMP) \
 		--prefix=/usr
 	convert -resize 32x32 gui/images/appicon.png debian/gpsbabel.xpm
-
-
-override_dh_installman:
-	export PATH="$(CURDIR)/gpsbabel:$$PATH" ;\
-	help2man 	--manual='gpsbabel documentation' \
-			--section=1 \
-			--name='GPS route and waypoint data converter' \
-			--source='http://www.gpsbabel.org' \
-			--locale=C \
-			-N \
-			--version-string=$(DEB_VERSION) \
-			--opt-include=$(CURDIR)/debian/gpsbabel.help2man \
-			-o debian/gpsbabel.1 \
-			./gpsbabel
-	dh_installman
+	xsltproc --output debian/gpsbabel.1 /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl xmldoc/gpsbabel_man.xml
 
 override_dh_auto_build-arch:
 	dh_auto_build